Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor sound changes and clarity. #5088

Merged
merged 19 commits into from
Dec 8, 2023
Merged

Conversation

zzzmike
Copy link
Contributor

@zzzmike zzzmike commented Dec 1, 2023

About the pull request

Adds the armorequip noise when backpack, uniform, shoes are unequipped. Changes the whoosh (disarm-stun) noise to only trigger when you stun someone. Adds sound to tablestun, and changes tablestun text to be more clear to new players that it stuns.

Explain why it's good for the game

In human vs human fights, sometimes your backpack/uniform/shoes get stolen. The armorequip sound is a good clue to draw attention to when this happens, both for the victim and the attacker, so adding it to a few more important gear pieces should be a benefit in these fringe cases. The effect is subtle enough, and the situation rare enough, that I don't think it would be too much. The whoosh sound is currently triggering when you "disarm" someone even when they are holding nothing in hand, which doesn't make sense. Now it's reserved for when a disarm-stun goes off. Swoosh sound added to tablestun, because tablestun being silent doesn't make sense. From my experience talking to players, tablestun is not very well known outside of veteran players who familiarized themselves with that niche interaction, so adding a sound and changing the text to make the effect clear should be a benefit.

Testing Photographs and Procedure

Screenshots & Videos

(https://www.youtube.com/watch?v=ElOAaq0dYcg&ab_channel=MK)

Changelog

🆑
spellcheck: tablestun text is more clear that it stuns
soundadd: unequip noise added to uniform, backpack, shoes.
soundadd: sound added to tablestun
sounddel: for disarms, whoosh only triggers on stun. otherwise, the miss sound plays
/:cl:

@github-actions github-actions bot added UI deletes nanoui/html Sound Blast 5 minutes of bass boosted music to our players labels Dec 1, 2023
@zzzmike
Copy link
Contributor Author

zzzmike commented Dec 1, 2023

I'm kinda split for either swoosh or tablehit1 for tableslams, but tableslam is pretty rare and the stun lasts for 10 seconds, so maybe a more noticeable sound like tablehit1 is warranted. I'm open to feedback of course.

@zzzmike
Copy link
Contributor Author

zzzmike commented Dec 1, 2023

tablehit1 actually seems quite reasonable at the 25 setting, much more reasonable compared to playing the sound outside of byond

aggressive grab floors you, so this would be the sound of you hitting the floor
@cuberound
Copy link
Contributor

before some maintainer comes along to tell you himself, rename the W M B G vars :)

@Birdtalon Birdtalon self-assigned this Dec 4, 2023
Copy link
Contributor

@Birdtalon Birdtalon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couple of sounds I'm not sure really fit. I think the uniform, boots backpack sound additions are all good.

code/modules/mob/mob_grab.dm Outdated Show resolved Hide resolved
code/game/objects/structures/tables_racks.dm Outdated Show resolved Hide resolved
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While you're at it you may as well add a sfx when fireman carrying a person. Can just be thudswoosh again; unless you find something else you like for a grab chain.

code/modules/mob/mob_grab.dm Outdated Show resolved Hide resolved
code/modules/clothing/shoes/marine_shoes.dm Outdated Show resolved Hide resolved
code/modules/clothing/under/marine_uniform.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft December 7, 2023 08:04
@zzzmike
Copy link
Contributor Author

zzzmike commented Dec 7, 2023

While you're at it you may as well add a sfx when fireman carrying a person. Can just be thudswoosh again; unless you find something else you like for a grab chain.

Disarm-stun is thudswoosh, passive-grab is thudswoosh, aggressive grab is thudswoosh... I don't think I can bring myself to add more, am gonna leave this alone for the moment, maybe it can be looked at in a separate PR or something. At least it's obvious from the animation when you carry them - whereas it's not super obvious when you passive or aggressive grab (there's slight animation but I feel like it can easily be missed in the heat of combat)

@zzzmike
Copy link
Contributor Author

zzzmike commented Dec 7, 2023

mob_grab.dm is back to default as per the review - thanks

@zzzmike zzzmike requested a review from Drulikar December 7, 2023 17:43
@zzzmike zzzmike marked this pull request as ready for review December 7, 2023 17:43
@Drulikar
Copy link
Contributor

Drulikar commented Dec 8, 2023

While you're at it you may as well add a sfx when fireman carrying a person. Can just be thudswoosh again; unless you find something else you like for a grab chain.

Disarm-stun is thudswoosh, passive-grab is thudswoosh, aggressive grab is thudswoosh... I don't think I can bring myself to add more, am gonna leave this alone for the moment, maybe it can be looked at in a separate PR or something. At least it's obvious from the animation when you carry them - whereas it's not super obvious when you passive or aggressive grab (there's slight animation but I feel like it can easily be missed in the heat of combat)

My recommendation would be to consider looking at other code bases like TG which I believe has different icons in your hand depending on the grab type (e.g. the aggressive grab is a red hand)

@Drulikar Drulikar added Grammar and Formatting Fixes the codebase's tpyos and grammatical's errors and removed UI deletes nanoui/html labels Dec 8, 2023
@Drulikar Drulikar added this pull request to the merge queue Dec 8, 2023
Merged via the queue into cmss13-devs:master with commit d0ae027 Dec 8, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Dec 8, 2023
@zzzmike zzzmike deleted the patch-3 branch December 8, 2023 02:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Grammar and Formatting Fixes the codebase's tpyos and grammatical's errors Sound Blast 5 minutes of bass boosted music to our players
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants